Emit the notify::model signal. (#509819, David Zeuthen)

2008-01-16  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkcombobox.c (gtk_combo_box_set_model): Emit
        the notify::model signal.  (#509819, David Zeuthen)

svn path=/trunk/; revision=19374

diff --git a/ChangeLog b/ChangeLog
index 534ed4230b4da3ba20bef285956564a2408b09ae..3b1cdcd2575112b1e2953ce0ea01868d5ee27f81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): Emit
+       the notify::model signal.  (#509819, David Zeuthen)
+
 2008-01-15  Michael Natterer  <mitch@imendio.com>
 
        * gdk/gdkdisplay.h

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 3dc094f82a2d31f311c397eb122a67f65b088d31..7021e716010e175bafb76caf5fc403d6389a3ee0 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4913,7 +4913,7 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
   gtk_combo_box_unset_model (combo_box);
 
   if (model == NULL)
-    return;
+    goto out;
 
   combo_box->priv->model = model;
   g_object_ref (combo_box->priv->model);
@@ -4953,6 +4953,9 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
   if (combo_box->priv->cell_view)
     gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view),
                              combo_box->priv->model);
+
+out:
+  g_object_notify (G_OBJECT (combo_box), "model");
 }
 
 /**